qemu: use new console interface in aarch32

Change-Id: Iab788e3e7cb2f83144255c4eb830712fd5cb6240
Signed-off-by: Ambroise Vincent <[email protected]>

diff --git a/plat/qemu/aarch32/plat_helpers.S b/plat/qemu/aarch32/plat_helpers.S
index cf6bae824af5cc7d690d7ac535a59d6a40654113..aebcfa78f95a748667dadeb50f9347bc3d57d55e 100644 (file)
--- a/plat/qemu/aarch32/plat_helpers.S
+++ b/plat/qemu/aarch32/plat_helpers.S
@@ -103,7 +103,7 @@ func plat_crash_console_init
        mov_imm r0, PLAT_QEMU_CRASH_UART_BASE
        mov_imm r1, PLAT_QEMU_CRASH_UART_CLK_IN_HZ
        mov_imm r2, PLAT_QEMU_CONSOLE_BAUDRATE
-       b       console_core_init
+       b       console_pl011_core_init
 endfunc plat_crash_console_init
 
        /* ---------------------------------------------
@@ -115,7 +115,7 @@ endfunc plat_crash_console_init
         */
 func plat_crash_console_putc
        mov_imm r1, PLAT_QEMU_CRASH_UART_BASE
-       b       console_core_putc
+       b       console_pl011_core_putc
 endfunc plat_crash_console_putc
 
        /* ---------------------------------------------
@@ -128,6 +128,6 @@ endfunc plat_crash_console_putc
         */
 func plat_crash_console_flush
        mov_imm r0, PLAT_QEMU_CRASH_UART_BASE
-       b       console_core_flush
+       b       console_pl011_core_flush
 endfunc plat_crash_console_flush
 

diff --git a/plat/qemu/sp_min/sp_min_setup.c b/plat/qemu/sp_min/sp_min_setup.c
index 88f7397c6aebd05b7816cc6c7716b564654e9f32..7ec657b796664d82282770ff1fd6a165f2503258 100644 (file)
--- a/plat/qemu/sp_min/sp_min_setup.c
+++ b/plat/qemu/sp_min/sp_min_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -93,8 +93,7 @@ void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
        bl_params_t *params_from_bl2 = (bl_params_t *)arg0;
 
        /* Initialize the console to provide early debug support */
-       console_init(PLAT_QEMU_BOOT_UART_BASE, PLAT_QEMU_BOOT_UART_CLK_IN_HZ,
-                       PLAT_QEMU_CONSOLE_BAUDRATE);
+       qemu_console_init();
 
        ERROR("qemu sp_min, console init\n");
        /*